From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 10 Feb 2011 18:37:27 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~16
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bc8a68d3ce4d7b06931d63f5f64c75420d3f8cab;p=emacs.git

Merge from mainline.
---

bc8a68d3ce4d7b06931d63f5f64c75420d3f8cab